Merge branch 'master' of https://github.com/marcbowes/cargo into pr-1094
authorAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:57:02 +0000 (11:57 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 31 Dec 2014 19:57:02 +0000 (11:57 -0800)
commit7bd6d0918a47b57295798e4a69ed3ce44d266a61
tree9acc6277998009a31eb66594de4996d4f8802cb8
parent2ca7a8ccc291fd0ecd185f0e3dd166bd766bb33f
parent5b90a02ccd7478ba1cb837385f0213d82a08ce8a
Merge branch 'master' of https://github.com/marcbowes/cargo into pr-1094